From 13a98d57514f5baae6d323f4f9e00fbceec99629 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 4 May 2004 19:23:31 +0000 Subject: [PATCH] fileio.c (Frename_file): Put symlink handling inside #ifdef S_IFLNK. --- src/ChangeLog | 1 + src/fileio.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2cc5fc4f9f3..5e15e9828da 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,7 @@ * fileio.c (barf_or_query_if_file_exists): Use lstat. (Frename_file): Handle renaming of symlinks across file systems. + (Frename_file): Put symlink handling inside #ifdef S_IFLNK. 2004-05-04 Kim F. Storm diff --git a/src/fileio.c b/src/fileio.c index 04068e25f89..7d20697b875 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2725,15 +2725,17 @@ This is what happens in interactive use with M-x. */) { if (errno == EXDEV) { +#ifdef S_IFLNK symlink_target = Ffile_symlink_p (file); - if (NILP (symlink_target)) + if (! NILP (symlink_target)) + Fmake_symbolic_link (symlink_target, newname, + NILP (ok_if_already_exists) ? Qnil : Qt, Qt); + else +#endif Fcopy_file (file, newname, /* We have already prompted if it was an integer, so don't have copy-file prompt again. */ NILP (ok_if_already_exists) ? Qnil : Qt, Qt); - else - Fmake_symbolic_link (symlink_target, newname, - NILP (ok_if_already_exists) ? Qnil : Qt, Qt); Fdelete_file (file); } else -- 2.30.2